Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

copy build.sh over from opensearch-build #4887

Merged
merged 1 commit into from
Oct 24, 2022

Conversation

rursprung
Copy link
Contributor

the build script should be located in this repository instead of centrally in opensearch-build to allow per-branch specific builds (newer versions might have newer requirements, which currently cannot be reflected).

the file was copied 1:1 from scripts/components/OpenSearch/build.sh as of commit 9e1aa38 in the opensearch-build repository.

this is part of opensearch-build#99 and needs to be backported to all active branches because the file here will only be used by the build once the central one in opensearch-build has been removed which in turn can only happen when all active branches have the build.sh.

Signed-off-by: Ralph Ursprung Ralph.Ursprung@avaloq.com

Description

see commit message.

note: this is completely untested as this is being used by the jenkins build which i can't reproduce locally.

Issues Resolved

part of opensearch-build#99

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@rursprung rursprung requested review from a team and reta as code owners October 24, 2022 13:54
@rursprung
Copy link
Contributor Author

CC @dblock & @peterzhuamazon

CHANGELOG.md Outdated Show resolved Hide resolved
the build script should be located in this repository instead of
centrally in [opensearch-build][] to allow per-branch specific builds
(newer versions might have newer requirements, which currently cannot be
reflected).

the file was copied 1:1 from `scripts/components/OpenSearch/build.sh` as
of commit 9e1aa38 in the [opensearch-build][] repository.

this is part of opensearch-build#99 and needs to be backported to all
active branches because the file here will only be used by the build
once the central one in opensearch-build has been removed which in turn
can only happen when all active branches have the `build.sh`.

[opensearch-build]: https://github.com/opensearch-project/opensearch-build

Signed-off-by: Ralph Ursprung <Ralph.Ursprung@avaloq.com>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@codecov-commenter
Copy link

Codecov Report

Merging #4887 (8ffc828) into main (dfa1118) will decrease coverage by 0.06%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##               main    #4887      +/-   ##
============================================
- Coverage     70.84%   70.78%   -0.07%     
+ Complexity    57932    57892      -40     
============================================
  Files          4689     4689              
  Lines        276913   276913              
  Branches      40301    40301              
============================================
- Hits         196192   196010     -182     
- Misses        64430    64639     +209     
+ Partials      16291    16264      -27     
Impacted Files Coverage Δ
...adonly/AddIndexBlockClusterStateUpdateRequest.java 0.00% <0.00%> (-75.00%) ⬇️
...readonly/TransportVerifyShardIndexBlockAction.java 9.75% <0.00%> (-73.18%) ⬇️
...n/admin/indices/readonly/AddIndexBlockRequest.java 17.85% <0.00%> (-53.58%) ⬇️
...main/java/org/opensearch/ingest/ProcessorInfo.java 21.05% <0.00%> (-47.37%) ⬇️
.../org/opensearch/client/indices/AnalyzeRequest.java 31.00% <0.00%> (-47.00%) ⬇️
...rc/main/java/org/opensearch/ingest/IngestInfo.java 34.48% <0.00%> (-44.83%) ⬇️
...adcast/BroadcastShardOperationFailedException.java 55.55% <0.00%> (-44.45%) ⬇️
.../java/org/opensearch/search/dfs/AggregatedDfs.java 54.83% <0.00%> (-41.94%) ⬇️
...indices/readonly/TransportAddIndexBlockAction.java 20.68% <0.00%> (-41.38%) ⬇️
.../admin/cluster/reroute/ClusterRerouteResponse.java 60.00% <0.00%> (-40.00%) ⬇️
... and 493 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@rursprung rursprung requested a review from dblock October 24, 2022 14:47
@dblock dblock merged commit e357246 into opensearch-project:main Oct 24, 2022
@dblock dblock added the backport 2.x Backport to 2.x branch label Oct 24, 2022
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 24, 2022
the build script should be located in this repository instead of
centrally in [opensearch-build][] to allow per-branch specific builds
(newer versions might have newer requirements, which currently cannot be
reflected).

the file was copied 1:1 from `scripts/components/OpenSearch/build.sh` as
of commit 9e1aa38 in the [opensearch-build][] repository.

this is part of opensearch-build#99 and needs to be backported to all
active branches because the file here will only be used by the build
once the central one in opensearch-build has been removed which in turn
can only happen when all active branches have the `build.sh`.

[opensearch-build]: https://github.com/opensearch-project/opensearch-build

Signed-off-by: Ralph Ursprung <Ralph.Ursprung@avaloq.com>

Signed-off-by: Ralph Ursprung <Ralph.Ursprung@avaloq.com>
(cherry picked from commit e357246)
@rursprung rursprung deleted the add-build-sh branch October 24, 2022 19:42
@rursprung
Copy link
Contributor Author

@dblock can you also trigger the automated backport to the other active branches besides 2.x? (see our discussion: opensearch-project/opensearch-build#99 (comment))

it must be present in all of those before we can safely delete it in the opensearch-build project.
it'd have been easier if the order of evaluation would've been the other way around, so that the more specific file always wins: in project > project-specific in build > generic instead of project-specific in build > in project > generic (which doesn't make a lot of sense to me)... but i guess this isn't something which can be changed now without risking breaking other things

dblock pushed a commit that referenced this pull request Oct 25, 2022
the build script should be located in this repository instead of
centrally in [opensearch-build][] to allow per-branch specific builds
(newer versions might have newer requirements, which currently cannot be
reflected).

the file was copied 1:1 from `scripts/components/OpenSearch/build.sh` as
of commit 9e1aa38 in the [opensearch-build][] repository.

this is part of opensearch-build#99 and needs to be backported to all
active branches because the file here will only be used by the build
once the central one in opensearch-build has been removed which in turn
can only happen when all active branches have the `build.sh`.

[opensearch-build]: https://github.com/opensearch-project/opensearch-build

Signed-off-by: Ralph Ursprung <Ralph.Ursprung@avaloq.com>

Signed-off-by: Ralph Ursprung <Ralph.Ursprung@avaloq.com>
(cherry picked from commit e357246)
Signed-off-by: Daniel (dB.) Doubrovkine <dblock@amazon.com>
@dblock dblock added backport 1.x backport 1.2 backport 2.0 Backport to 2.0 branch backport 1.3 Backport to 1.3 branch backport 2.1 backport 2.2 Backport to 2.2 branch backport 2.3 Backports to 2.3 branch backport 1.0 Backport to 1.0 branch backport 1.1 Backport to 1.1 branch labels Oct 25, 2022
@dblock
Copy link
Member

dblock commented Oct 25, 2022

@rursprung I labeled a bunch of backports ... watch them fail :)

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.1 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.1 2.1
# Navigate to the new working tree
cd .worktrees/backport-2.1
# Create a new branch
git switch --create backport/backport-4887-to-2.1
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e3572464859d728c64d5a6f85e8ba0bd51314a5d
# Push it to GitHub
git push --set-upstream origin backport/backport-4887-to-2.1
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.1

Then, create a pull request where the base branch is 2.1 and the compare/head branch is backport/backport-4887-to-2.1.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.3 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.3 2.3
# Navigate to the new working tree
cd .worktrees/backport-2.3
# Create a new branch
git switch --create backport/backport-4887-to-2.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e3572464859d728c64d5a6f85e8ba0bd51314a5d
# Push it to GitHub
git push --set-upstream origin backport/backport-4887-to-2.3
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.3

Then, create a pull request where the base branch is 2.3 and the compare/head branch is backport/backport-4887-to-2.3.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.0 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.0 1.0
# Navigate to the new working tree
cd .worktrees/backport-1.0
# Create a new branch
git switch --create backport/backport-4887-to-1.0
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e3572464859d728c64d5a6f85e8ba0bd51314a5d
# Push it to GitHub
git push --set-upstream origin backport/backport-4887-to-1.0
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.0

Then, create a pull request where the base branch is 1.0 and the compare/head branch is backport/backport-4887-to-1.0.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.2 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.2 2.2
# Navigate to the new working tree
cd .worktrees/backport-2.2
# Create a new branch
git switch --create backport/backport-4887-to-2.2
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e3572464859d728c64d5a6f85e8ba0bd51314a5d
# Push it to GitHub
git push --set-upstream origin backport/backport-4887-to-2.2
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.2

Then, create a pull request where the base branch is 2.2 and the compare/head branch is backport/backport-4887-to-2.2.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.2 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.2 1.2
# Navigate to the new working tree
cd .worktrees/backport-1.2
# Create a new branch
git switch --create backport/backport-4887-to-1.2
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e3572464859d728c64d5a6f85e8ba0bd51314a5d
# Push it to GitHub
git push --set-upstream origin backport/backport-4887-to-1.2
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.2

Then, create a pull request where the base branch is 1.2 and the compare/head branch is backport/backport-4887-to-1.2.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.0 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.0 2.0
# Navigate to the new working tree
cd .worktrees/backport-2.0
# Create a new branch
git switch --create backport/backport-4887-to-2.0
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e3572464859d728c64d5a6f85e8ba0bd51314a5d
# Push it to GitHub
git push --set-upstream origin backport/backport-4887-to-2.0
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.0

Then, create a pull request where the base branch is 2.0 and the compare/head branch is backport/backport-4887-to-2.0.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.x 1.x
# Navigate to the new working tree
cd .worktrees/backport-1.x
# Create a new branch
git switch --create backport/backport-4887-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e3572464859d728c64d5a6f85e8ba0bd51314a5d
# Push it to GitHub
git push --set-upstream origin backport/backport-4887-to-1.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.x

Then, create a pull request where the base branch is 1.x and the compare/head branch is backport/backport-4887-to-1.x.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.1 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.1 1.1
# Navigate to the new working tree
cd .worktrees/backport-1.1
# Create a new branch
git switch --create backport/backport-4887-to-1.1
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e3572464859d728c64d5a6f85e8ba0bd51314a5d
# Push it to GitHub
git push --set-upstream origin backport/backport-4887-to-1.1
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.1

Then, create a pull request where the base branch is 1.1 and the compare/head branch is backport/backport-4887-to-1.1.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.3 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.3 1.3
# Navigate to the new working tree
cd .worktrees/backport-1.3
# Create a new branch
git switch --create backport/backport-4887-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e3572464859d728c64d5a6f85e8ba0bd51314a5d
# Push it to GitHub
git push --set-upstream origin backport/backport-4887-to-1.3
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.3

Then, create a pull request where the base branch is 1.3 and the compare/head branch is backport/backport-4887-to-1.3.

@rursprung
Copy link
Contributor Author

@rursprung I labeled a bunch of backports ... watch them fail :)

darn... ok 😄
i can try to do them manually, but that has to wait for next week.

@dblock
Copy link
Member

dblock commented Oct 25, 2022

@peterzhuamazon What are the active branches we need this in?

reta pushed a commit that referenced this pull request Oct 25, 2022
the build script should be located in this repository instead of
centrally in [opensearch-build][] to allow per-branch specific builds
(newer versions might have newer requirements, which currently cannot be
reflected).

the file was copied 1:1 from `scripts/components/OpenSearch/build.sh` as
of commit 9e1aa38 in the [opensearch-build][] repository.

this is part of opensearch-build#99 and needs to be backported to all
active branches because the file here will only be used by the build
once the central one in opensearch-build has been removed which in turn
can only happen when all active branches have the `build.sh`.

[opensearch-build]: https://github.com/opensearch-project/opensearch-build

Signed-off-by: Ralph Ursprung <Ralph.Ursprung@avaloq.com>

Signed-off-by: Ralph Ursprung <Ralph.Ursprung@avaloq.com>
(cherry picked from commit e357246)
Signed-off-by: Daniel (dB.) Doubrovkine <dblock@amazon.com>

Signed-off-by: Ralph Ursprung <Ralph.Ursprung@avaloq.com>
Signed-off-by: Daniel (dB.) Doubrovkine <dblock@amazon.com>
Co-authored-by: Ralph Ursprung <39383228+rursprung@users.noreply.github.com>
@peterzhuamazon
Copy link
Member

@peterzhuamazon What are the active branches we need this in?

1.x, 1.3, 2.x, 2.3, 2.4, main.

Thanks.

rursprung added a commit to rursprung/OpenSearch that referenced this pull request Oct 31, 2022
the build script should be located in this repository instead of
centrally in [opensearch-build][] to allow per-branch specific builds
(newer versions might have newer requirements, which currently cannot be
reflected).

the file was copied 1:1 from `scripts/components/OpenSearch/build.sh` as
of commit 9e1aa38 in the [opensearch-build][] repository.

this is part of opensearch-build#99 and needs to be backported to all
active branches because the file here will only be used by the build
once the central one in opensearch-build has been removed which in turn
can only happen when all active branches have the `build.sh`.

[opensearch-build]: https://github.com/opensearch-project/opensearch-build

Signed-off-by: Ralph Ursprung <Ralph.Ursprung@avaloq.com>

Signed-off-by: Ralph Ursprung <Ralph.Ursprung@avaloq.com>
(cherry picked from commit e357246)
rursprung added a commit to rursprung/OpenSearch that referenced this pull request Oct 31, 2022
the build script should be located in this repository instead of
centrally in [opensearch-build][] to allow per-branch specific builds
(newer versions might have newer requirements, which currently cannot be
reflected).

the file was copied 1:1 from `scripts/components/OpenSearch/build.sh` as
of commit 9e1aa38 in the [opensearch-build][] repository.

this is part of opensearch-build#99 and needs to be backported to all
active branches because the file here will only be used by the build
once the central one in opensearch-build has been removed which in turn
can only happen when all active branches have the `build.sh`.

[opensearch-build]: https://github.com/opensearch-project/opensearch-build

Signed-off-by: Ralph Ursprung <Ralph.Ursprung@avaloq.com>

Signed-off-by: Ralph Ursprung <Ralph.Ursprung@avaloq.com>
(cherry picked from commit e357246)
rursprung added a commit to rursprung/OpenSearch that referenced this pull request Oct 31, 2022
the build script should be located in this repository instead of
centrally in [opensearch-build][] to allow per-branch specific builds
(newer versions might have newer requirements, which currently cannot be
reflected).

the file was copied 1:1 from `scripts/components/OpenSearch/build.sh` as
of commit 9e1aa38 in the [opensearch-build][] repository.

this is part of opensearch-build#99 and needs to be backported to all
active branches because the file here will only be used by the build
once the central one in opensearch-build has been removed which in turn
can only happen when all active branches have the `build.sh`.

[opensearch-build]: https://github.com/opensearch-project/opensearch-build

Signed-off-by: Ralph Ursprung <Ralph.Ursprung@avaloq.com>

Signed-off-by: Ralph Ursprung <Ralph.Ursprung@avaloq.com>
(cherry picked from commit e357246)
@rursprung
Copy link
Contributor Author

i've now created the necessary backports

reta pushed a commit that referenced this pull request Oct 31, 2022
the build script should be located in this repository instead of
centrally in [opensearch-build][] to allow per-branch specific builds
(newer versions might have newer requirements, which currently cannot be
reflected).

the file was copied 1:1 from `scripts/components/OpenSearch/build.sh` as
of commit 9e1aa38 in the [opensearch-build][] repository.

this is part of opensearch-build#99 and needs to be backported to all
active branches because the file here will only be used by the build
once the central one in opensearch-build has been removed which in turn
can only happen when all active branches have the `build.sh`.

[opensearch-build]: https://github.com/opensearch-project/opensearch-build

Signed-off-by: Ralph Ursprung <Ralph.Ursprung@avaloq.com>

Signed-off-by: Ralph Ursprung <Ralph.Ursprung@avaloq.com>
(cherry picked from commit e357246)
reta pushed a commit that referenced this pull request Oct 31, 2022
the build script should be located in this repository instead of
centrally in [opensearch-build][] to allow per-branch specific builds
(newer versions might have newer requirements, which currently cannot be
reflected).

the file was copied 1:1 from `scripts/components/OpenSearch/build.sh` as
of commit 9e1aa38 in the [opensearch-build][] repository.

this is part of opensearch-build#99 and needs to be backported to all
active branches because the file here will only be used by the build
once the central one in opensearch-build has been removed which in turn
can only happen when all active branches have the `build.sh`.

[opensearch-build]: https://github.com/opensearch-project/opensearch-build

Signed-off-by: Ralph Ursprung <Ralph.Ursprung@avaloq.com>

Signed-off-by: Ralph Ursprung <Ralph.Ursprung@avaloq.com>
(cherry picked from commit e357246)
reta pushed a commit that referenced this pull request Oct 31, 2022
the build script should be located in this repository instead of
centrally in [opensearch-build][] to allow per-branch specific builds
(newer versions might have newer requirements, which currently cannot be
reflected).

the file was copied 1:1 from `scripts/components/OpenSearch/build.sh` as
of commit 9e1aa38 in the [opensearch-build][] repository.

this is part of opensearch-build#99 and needs to be backported to all
active branches because the file here will only be used by the build
once the central one in opensearch-build has been removed which in turn
can only happen when all active branches have the `build.sh`.

[opensearch-build]: https://github.com/opensearch-project/opensearch-build

Signed-off-by: Ralph Ursprung <Ralph.Ursprung@avaloq.com>

Signed-off-by: Ralph Ursprung <Ralph.Ursprung@avaloq.com>
(cherry picked from commit e357246)
ashking94 pushed a commit to ashking94/OpenSearch that referenced this pull request Nov 7, 2022
the build script should be located in this repository instead of
centrally in [opensearch-build][] to allow per-branch specific builds
(newer versions might have newer requirements, which currently cannot be
reflected).

the file was copied 1:1 from `scripts/components/OpenSearch/build.sh` as
of commit 9e1aa38 in the [opensearch-build][] repository.

this is part of opensearch-build#99 and needs to be backported to all
active branches because the file here will only be used by the build
once the central one in opensearch-build has been removed which in turn
can only happen when all active branches have the `build.sh`.

[opensearch-build]: https://github.com/opensearch-project/opensearch-build

Signed-off-by: Ralph Ursprung <Ralph.Ursprung@avaloq.com>

Signed-off-by: Ralph Ursprung <Ralph.Ursprung@avaloq.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 1.x backport 1.0 Backport to 1.0 branch backport 1.1 Backport to 1.1 branch backport 1.2 backport 1.3 Backport to 1.3 branch backport 2.x Backport to 2.x branch backport 2.0 Backport to 2.0 branch backport 2.1 backport 2.2 Backport to 2.2 branch backport 2.3 Backports to 2.3 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants